Shenzhen expert updates

@tobie - please don't merge this one. @lmclister will do it once we get final confirmation.