please, integrate issues 1565 and 1569

[Vladimir Ivanov]

Committers, please, integrate issues 1565 and 1569. These improvements are
trivial but important for 'B&T infrastructure'.

Thanks, Vladimir