MAP-954: more improvements to relaese.