Working on local file reading
Merge remote-tracking branch 'origin/dev-bs' into dev-bs
Final touches
Merge remote-tracking branch 'origin/dev-bs' into dev-bs