Fix/2.9/8356

Fix staging files containing invalid characters to form URI