mpen-12 #674 (mpen-12)