Initial merge from my fork...