improve v2.1.x support

M