Fixed performance problem.
(cherry picked from commit 3f35ae9)
Fixed performance problem with collecting parts for implicit objects.
(cherry picked from commit cc0e46f)