Merge "Avoid clock and challenge overlap" into pi-dev