Merge "Validate axes and led labels correctly"