Editor's drafts for add-patch-indicator branch of cabo/sdf-mapping