Submit a feature that applies graceful up and down (#4670)

Submit a feature that applies graceful up and down (#4670) #4927