DATAGRAPH-458 & DATAGRAPH-460 : Spring 4.X compatibility