Merge "Modify FAN_DIRECTION to be a bit mask"