Merge "Fix an issue the Adaptor is not resumed" into devel/master