mpen-12 #1704 (mpen-12)