Merge "Change small area detection to support new front end design" into main