1117 backup snapshot
merged into github repo