n5110: merge into common repo kona-common