Merge "Fix Apache stack"