Merge develop into issue-702 branch