trying to fix some errors refs #3722
Merge remote-tracking branch 'origin/master'