Merge remote-tracking branch 'martin/MINDEXER-80'