/complete-plan-and-merge

move plan to completed, merge to develop, cleanup branch