#4137 continue manager refactoring
#4137 continue manager refactoring