First build of multi-modal branch after hdd crash