renamed class
Merge commit 'c85b3bce86e8c654f131f35822a3797f8d15a2e6' into develop