1. duplicate id issue, MAK-1702 2. shrink issue, STUDIO-4048 Change-Id: Ie952f1ecc5267a60f0ce3220c4a5ea31cf7199ff