Aurora patches fix bad merge issue