Merge "Fix mobly issue" into main