Merge "Add option to skip build of tests"