DO NOT MERGE
Fix the build, which has been also fixed separately in the master
1 file changed