#1678 & #1677 & #1675