Merge commit 'origin/bug_171_remove_wrong_triple_dots'