merge cleanup
Cleaned up manifest to only show one listener
Merge remote-tracking branch 'origin/interfaceobjecttest' into interfaceobjecttest