Merge branch 'apei' into release