change content add behavior
Merge commit '7aa274349ac4e68a92de2fe7922b6e4bf8ca5e95'