Add gaetway cleanup as needed
Merge remote branch 'origin/7.x-3.0-qa' into 7.x-3.0-qa