[imp] [32944] Save and Close in template component; Closes #3685