0.4.0 - pulling in change from core for redirecting