[CRNX-148] CRNX-148