Merged Sulev changes and other cleanup tasks