Merge "Add header message for scope storage"