core helper restores chainable state as well
core helper restores chainable state as well


Former-commit-id: f2fb083c395732fe2c469b59c72ca4b6cbab6ba5 [formerly d21c3f2932bf8dc49942e108f982c4ec0cdb4b48]
Former-commit-id: 0aebd67ae862946d9fc9a77126b82e2c017aad6f
romancow/Sugar,romancow/Sugar,andrewplummer/Sugar,andrewplummer/Sugar