#nv-1 Fixed work 4h30m Minor issue remained undone.
Merge remote-tracking branch 'origin/master'