Dedup params

Please first merge request #159 as this assumes master has been merged into 3.1.x first