CHERKASY-61
-small adjustments following a pull request