Merge pull request #3977 from AndrzejKurek/fi-missing-volatile

FI variables missing 'volatile'