Merge "Fix declination argument boundary checks" into main