Merge "fix markup for gl pie" into jb-dev