Merge "Handle kernel boot options"