Added changes by Deborah Salcher for IXXL-1078