PM bug fix
Merge branch 'yama'