My changes again after upgrading to 2.5.0-build-2 and fixing missing other updates