merge Proposed changes branch