merge of last mainline and local changes for FB_03 subsription test.
Merge pull request #94 from RonPasquarelli/master

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