Jenkins 12447

New PR for jenkins fix on #12447