Merge "Allow observers to be loaded correctly" into sc-dev