Fixed merge-induced compilation errors
14 files changed