WIKI-193 Fix bug merge with master