[CRNX-149] CRNX-149