Fixed executor version
Merge origin/master