Extend {Flux,Mono}OnErrorComplete Refaster rules
#1939
Merged
{Flux,Mono}OnErrorComplete Refaster rules
#1939