Sync with semc7x30 (Mike)