mpen-12 #662 (mpen-12)