2.1 release - 1.5 support