committing changes from dev_bugfix to remote/bugfix

++ merging changes from dev_bugfix to remote/bugfix ++