Issues #1432, #1437, #1546