map final update
Merge remote-tracking branch 'origin/master'
prev-next links in details