Fix to removing the root element causing issues with pivoting
Merge branch 'hotfix-2.1.19' into develop