Merge e66236116b from Floens/Clover
Fix board removal