play 2.1-RC4

Closes #17499.

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