improvements to what is content
Merge commit '633955ee776baacdf4612a4680554e8441dc696c' into HEAD