Noting #1310, #1294, #1311