BZ-11128 and BZ-11129: testing

Signed-off-by: Paden <padenportillo@gmail.com>