Minor fixes
Merge pull request #3014 from vlakoff/various

Various fixes
Merge remote-tracking branch 'upstream/develop' into develop