[approval] Commit HARMONY-5501

[Pavel Pervov]

I'd like to commit HARMONY-5501. This is the regression since M4 and
thus should be fixed.

Still the fix is pretty local.

Thanks,
    Pavel.