Commit 0545759b2ed9b69e3f21fd0ac954bee78f3104b6

Evgenii Kliuchnikov 2020-08-28T10:14:08

Address issues noted in #833