Bring matt-develop back in line with 3.0 changes