6731815a3a
This also fixes build with modern compilers (gcc12+, clang15+) With hat: office
This also fixes build with modern compilers (gcc12+, clang15+) With hat: office