Merge Master to Branch v1.6.1 - pre-release