Adding work from 3.4 and on