Add option to build fixed rfs
Simplify fixed rfs logic
Merge branch 'dev-rfs' into dev