(cherry picked from commit ce9d9b5e69fe5f47847cc511ffd73f6b43de92e7)
reparented some elements to docs. (cherry picked from commit 4fa35e51e0e0d193bf81f4465f4e1ba4caa5b3ca)