Merge pull request #4561 from Ansuel/fix-enc-ap