Merge "Fix internal server error during updating QoS rule"