Better handling of CLOSED DUPLICATE

Change-Id: I15dff00e1ac79b6ee725aea2e175d45beac05d61
Merge "Better handling of CLOSED DUPLICATE" into develop