Mob 1543

Do not merge, for code review only