Merge branch 'adaptercomm'. bugzid: 654