CURRIKI-6308, sorry for poluting dev