Noting #1196, #1200, #1201