Merge "Ignore adaptor action when adpator is stop" into devel/master