make sure dimension is encoded during table menu calls
Merge branch 'master' into 2.5.x