* Fixed a couple of occurrences where scopes was auto-complated while actually modified the state of the database. * Added temp ctor to fix boot issue (cherry picked from commit 41f8f03c2c)
41f8f03c2c