#17309 - add save and continue button