Sync with fork master

Preparing for new branch.