Merge changes Iee153445,Iee274471

* changes:
  Fix Wunused-parameter warning
  Upgrade eigen to 3.4.0