CURRIKI-6308 and again :/