Merge commit 'c0292b04407d93a11ee1412ed52cc5b04642a6f1' * commit 'c0292b04407d93a11ee1412ed52cc5b04642a6f1': Fix the build