Buildfix for develop merge