misc update.
Merge branch 'master' into synchronization