Bugs #447, #216, #1914, #1893, #2025