[SR-Dev] git:master: Merge branch janakj/flatstore into branch master