Missing files from last v2.9.1 commit