Commit Trunk merge by Aliazzz:
Fixed Metric
Authored by: aliazzz 2020-04-17
Parent: [r65]
Child: [r67]