refs #1574
Merge branch 'akouryy_ja'