Noting #1327, #1328, #1315