sync with rev73 extensions
Vadim Tkachenko authored
f657606d