Merge "Workaround apparent clang compilation issue"