merge changes for subscription v2.1 support