HIPPOTHEME-26: Include backports for HIPPOTHEME-16, 17 and 18