BS-2672
BBPMC-135
Keep document name to handle UTF8 correctly