Merge "Add fine-grained debug layer"