XFileSharingPro additions
Merged #569