possible bugfix
Merge master to staging for version team city build 1.0.90
New release 1.0.90