Merge "fix for SO-2696"