Merge "Moving logging include"