Merge "Fix for SO-2617"