4.2.7-3.ufhpc
Resolve 4.2.7-3.ufhpc merge conflicts