Merge "mapper: support new usage and format" into qt-dev