Merge "Fix empty mac .toc generation"