#155870, #155861 fixes.