Merge "Move logic onto default dispatcher. Clearing main - stop performance bug" into main