Merge "Fix multicloud logging issue"