Closes #12904

- added feature;
- fixed bug;
- refactored code;
- improved app.