Merge "Made use of proper backend-fail-store message"