merged remaining of v0.6-IdCleaning branch (7180->7213) to incorporate global router stuff in trunk