merge changes for subscription v2.1 support

please take care of the todo