Merge "Fixing issue #3200503"