ROO-3288 fix
Merge branch 'ROO-3288'