Merge branch 'distro-entry-form-recover' into distro-entry-form