Syncing with original apache fork