Make sure the formcontroller reset dirty state on save
Merge