Starting work on 3.4.4 integration