Merge "fix for architecture and consumedapi"