Merge branch 'source-map-gen-apply-map'
Merge branch 'source-map-gen-from-map-doc'