PR target/7531: