Merge "move hardware feature definitions"