more support for 4.4 build
5 files changed