Preparatory work for PR target/21623: