Syndic main loop develop 2

Duplicate pull request of #10175 (See also #10164) to fix merge.