Port commit 2722bab8ca05af6b62fc596a04aaf6c3976d8824 by Yuri Chornoivan

Authored by danders on Feb 28 2020, 11:49 AM.