Fix syntax. #3470.
Merge branch 'feature_3470' into 2.2-3470