Merge "pass on Pause/Resume event to Adaptor" into devel/master