1.6.1 support
Version to 3.18.1 for release