Merge changes up to release 1.6.1