po: resync with source code