Merge "Remove ignored call to onTransferred() and simplify checks" into main