merged long-name truncation fix from RC_0_16