YAP 6.2.2

Closes #17309.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>