Copied across MKL25Z port from Master to Release