Merge "Override behavior for overview temporarily" into main