Latest fixes from MaykinMedia

Ticket BB-2035 is fixed here.