- merged pawitp 4.4 bringup