merge of last mainline and local changes for FB_03 subsription test.