* This commit does every 2.3 change required to get the build pass * None of the changes can be extracted, without changing the build setup