Merge pull request #635 from akvo/feature/634-not-able-to-submit-because-of-core-mandatory-check