WCM-97

WCM-97 Fix packaging errors with latest SDK version