Build #40:   Try to optimize build on branch build-optimize over 5 years ago