Merge "Fix the deprecated directlyOn method" into main