Sweeping !1529 from master to devel: [master] Fix removal of prod.input_dataset.conditions_id