GeneratePropertyRoutes with Id
Merge branch 'master40'