Merge "Return early on "cannot execute function"" into main