Minor bug in QS-2815 fix
Merge branch '1.1'