Merge branch 'apei-release' into release