Mid-developing commit.

Commit before merge,