mpen-12 #1673 (mpen-12)