Commit 04.30 changes.