Fixed update should be postponed until after schema has been initialized
Merge branch 'develop/6' into develop/7