Changes since tag v7

commit 7ece428354c29d6eaddfeecac79e2851a0a2a206
Author: David Lynch <kemayo@gmail.com>
Date:   Fri Apr 19 00:55:29 2019 -0500

    Update for uiMapId

