Sync to master vs. docker in preparation for merging