Implemented VFS-16
Implemented VFS-19
Merge remote-tracking branch 'origin/master'