fix smoke tests for new maps links
Merge branch '1.12'