merge changes for subscription v2.1 support

doesn't this destroy downward compatibility?