Whisper fixes.
Topic TopicMAsk builders.
Avoid double calling of require()
Merge remote-tracking branch 'upstream/develop' into bugfix