Merge "Implement non-JS RollbackAction with form"