Merge branch 'cherry-pick-89a1cbff' into '1.3-dev'

Merge branch '5797-cancel-button-has-no-effect-apply-template' into '1.3-dev'

See merge request fusiondirectory/fd!456