Merge Master to Branch v1.6.1

Merge Master to Branch v1.6.1