Merge changes I2157efc5,Iaf1d6f9c

* changes:
  run-as: Migrate to blueprint
  Add a way to disable run-as at runtime