fix bug #1088
Revert "fix bug #1088"

This reverts commit c53ea1052357bfb0b77bfa116ec16b1dc23d9c22.
fix bug #1088
Merge branch 'development', remote-tracking branch 'origin' into 001_vodka