apply: backport applyNext behaviour fixes
0.4.24