Merge "Avoid spammy adjustCallback iterations." into sc-dev