merge two lines into one?
# TODO: Apply patches with the upstream code.