[DF-1422] Moved fix to Development