Merge "Fix shell handler mapping tracing" into main