Updates to support the alterations from Andre, during his merge with 4.1.1-BETA1x