fix install map
debug
debug
debug
debug
remove debug
Merge branch 'dev' into stage