Merge "Fixes FDIO kernel settings" into stable/colorado