mpen-12 #1679 (mpen-12)