MBS-6813: Correct invalid syntax
Merge branch 'mbs-6813' into beta