Noting #1237, #1240, #1250, #1251, #1304