Build: #596 was successful Changes by Sam <samuel.vonstachelski@fhnw.ch>