fix inout
DEV-22375
Merge branch 'master' into releases