t-tk Merge branch 'cmap-customize', 2020-02-29