Fix DDC-2409
Merge pull request #655 from FabioBatSilva/DDC-2409

[DDC-2409] Fix merge association STATE_NEW