mpen-12 #653 (mpen-12)