merge request - update to soapy_support