Merge "when create/get/update failed return None rather than False"