Merge "Fix for 5393156"