Merge "Partly revert ag/28850904 to solve small clock overlaps with smartspace" into main