pmo-trunk-r497