merge branch with fixes of bg #71

13 files changed