Monke #9521 (#9521)