This branch is completely based on branch hlt1_fest (!70 (closed)) which should be merged first.
hlt1_fest
Goes together with Allen!766 (closed)