Merge branch 'ISSUE-66918282' of github.com:apid/apid-core into ISSUE-66918282