Merge "Revert "Group revert of the following commits for design docs:"" into jb-dev