Signed-off-by: Max Risuhin <risuhin.max@gmail.com>
* Desktop branch merged into develop * Fixed review notes by yenda