Revert filesystem changes [testing], RS sensitivity, merge r7-sprint