GE-1: track map created
Merge branch 'GE-1'
Branches update