Merge "Removed warning when objects are added on wrong order." into nyc-dev