Added Pod encoding. RT# 85897.
Prep for release 2.39.