Track 4-0-stable branch