Cherry pick from 7bf62bc5c94e2637f89269d2b335a537112bd289 (INSPIRE fixtures)