Update april2020

Merged Shuo Jia requested to merge update-april2020 into master

Updates from Mark Jones. Improved current correction

Merge request reports