[MOD-1491] Updating Stable branch from Master