Merge From Apache