Sync to Master

Issue 772 update