Cherry picked lost changes
Cherry picked lost changes