isync 1.1.0

Closes #25401.

Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>
finish merge