New branch unstable20_iOS which has only the smartstore changes from uns...

...table20