Adding message from PM to fix bug number 2396.