Code cleanup & updates for 4.4 libraries.
Merge remote-tracking branch 'origin/master'