Reinforce file markers and seed checks
Merge branch 'saltshare' into develop