Merge branch '5.1'

Authored by stikonas on Oct 6 2019, 6:15 PM.

Description

Merge branch '5.1'

Merged Changes

CommitAuthorDetailsCommitted
b819ef6a3549D24149valeriymalov
Cleanup ViewModel a bit and try to fix crash on exit 
Sep 29 2019