Merge branch 'Hotfix'

Merge hotfix into master
tree: c2051bf67396a4c8874fe83290a95833cbcee236
  1. AntExample1/