Merge "Fix for Issue: 3196583"