Merge tag 'v4.4.240' into v4.4-rt

This is the 4.4.240 stable release