Merge branch 'apei' into apei-release