2.3.4b4 Build and Build/config file updates