Updated for 5.4.7 build - config for build diag timeout