Fixed test broken in merge
Merge branch 'release' into dev