Changed back to update from drop-create, so now it works.
Merge securityandusers into master.
Merge from master.