Merge branch 'main' into aeschli/noremoteindicatorweb