6.x Update to address an incurrectly included folder