2018.4 hot fix with combined sourcetree