convert from using fix property/atom to using fix store
(cherry picked from commit 280aef55d2b7d8dbe4878247075f8c5aad94b73e)