[BP-04] Gertjan Vermeir - Leftovers - Final Commit.