Merge "bump the SO release version 1.6.1"