Merge "Fix the fault client returns 500 instend of 404" into i-release