APLANATS-603: duplicate rows fix
Merge remote-tracking branch 'origin/master'