Merged with current stable.