fixes #4173 - don't update CR attrs when none available, taken from GH-1184
(cherry picked from commit ec4ff916ebefa8fc0d4ac41548d02407e7cf8fac)
fixes #4173 - don't update CR attrs when none available, taken from GH-1184
(cherry picked from commit ec4ff916ebefa8fc0d4ac41548d02407e7cf8fac)