#4159, #4155 continue updates