#4220 - changes merged