3.16 release - 1.5 support