Merge "Track beijing branch of modelspec" into beijing