Merge commit '8d104f17520367f4018026b1fb3a763d2f7d8281' into develop
fix class name
Merge branch 'feature/halt'