Merge branch 'master' of github.com:30x/apid-core into XAPID-1093