[SR-Dev] git:master: Removing flatstore module from modules_s