code style fixes
merge b911171e848b032c2727c2443524720a38b6eb87 to 37caeda762fd2bdf3798ce51a8a136cbd262d102 (from 0.11)
code style fixes
even more code style fixes