Merge "Improve layers debugging"