Added missing map symbols to yaml
Merge branch 'release/v0.31'