Merge branch 'master' into zurich-mandatory-telephone-number