lmk if anyone has anything they’d like cherrypicked into 1.6.x - planning to cut an rc1 tonight/early tomorrow.