changes for 1.5.0 sprint in Linux