Implemented VFS-16 (typo)
Merge remote-tracking branch 'origin/master'