qa changes, copying wrapper updates from other staff