Cache-busted user_code for recent changes
Merge branch 'master' into integration

* master:
  Cache-busted user_code for recent changes