Stops objects indexing at the end
Merge pull request #3615 from yurydelendik/stopindexing

Stops objects indexing at the end