am a61ac525: Merge "Fix module constructor order."

* commit 'a61ac5257bea15d6cbfc640c03f18c2fb808b139':
  Fix module constructor order.