Merge PAC-man/pac-4.4 into pac-4.4

Change-Id: I16935886063d9e594a7037e8bb164d3bd092cc6a