Merge "Fix for SO-2678"