Port of File Browse Fixes to 1.7 branch

As referenced here: https://github.com/bolt/bolt/pull/1426