Merge pull request #4099 from skoeva/remove-execsync