Fix APIMANAGER-3030