#4137 continue manager refactoring