SCRUM#582: Disable autoupdate controls when disabled and organize object IDs

4 jobs for issue/582 in 5 minutes and 55 seconds (queued for 2 seconds)