Fix BPL description mapping
Merge branch 'release-v9.3'