change content add behavior
Merge commit '7aa274349ac4e68a92de2fe7922b6e4bf8ca5e95'
Merge commit '12c3bed6e2c4797e17456d7bfbc730dcf6954d30'