Merge "Fix for BUG 3623"