Apply upstream #216 - pluggable storage backends