Update to 20200504
Changelog:
PR: 246433 Submitted by: kdeguchi@sz.tokoha-u.ac.jp (maintainer) Approved by: ehaupt (mentor)