Merge branch 'jfire2' into routing