Align next to stable.
Merge pull request #601 from ktf/align-next-to-stable

Align next to stable.