Consolidate Masayuki's changes

Merge request reports

Loading