Sequence #'s step 2.
Merge branch 'api-click-rework' of https://github.com/XIA-Project/xia-core into api-click-rework