Closes #17436 #14630 Updates #6881 #12159 (cherry picked from commit 81bb03b00de4126a0bab93e4e7ee99d8725a0fe3) Update 2016_06_22_03_world.sql (cherry picked from commit 752ef03c431d8f04a81f55612373e7106491eeb1)
Closes #17436 #14630 Updates #6881 #12159 (cherry picked from commit 81bb03b00de4126a0bab93e4e7ee99d8725a0fe3) Update 2016_06_22_03_world.sql (cherry picked from commit 752ef03c431d8f04a81f55612373e7106491eeb1)