Merge pull request #188 from olegabr/master

Merges of all current bug-NNN branches into the master