Merge branch 'compal-fix' into release-2.6.27