test refinements
Merge remote-tracking branch 'origin/fix7.1' into fix7.1
update NSNotificationCenter adapter