few litte bug fixes
Merge branch 'development' into qa

* development:
  few litte bug fixes