[TER] 4.7.11: Update for running on 6.0.1