Merge "Fix crash in SthalCli" into main