WORDS-93 remove ->  todo: move to separate method
Merge remote-tracking branch 'origin/develop' into develop