Merge change 21152

* changes:
  Implement named slots and convert script.addType to script.setType to remove ordering restrictions.