revert Object Notify fix and fis store sample