Merge branch 'jc/fmt-merge-msg-people'