Merge "pushing error and audit log changes for portal"