Moving some rewrite cond around
Merge remote branch 'origin/dev'