Alternative fixes for iris!886 that do not rely on backwards compatibility layer See merge request !29