MBNK-534 - lost index controller
Merge remote-tracking branch 'origin/master'