Merge pull request #3158 from smortex/riemann-meta-data