Do not postpone “static callback” resolution.
Merge branch 'incoming'