Merge branch 'fix-bad-merge' into 'master'

Fix bad merge

/cc: @dzaporozhets 

See merge request !2116