Work in progress. Sync commit.