Merge branch 'mntechnique-pos_pf_with_draft_status' into develop