return_204 support for 1.15