manual merge of less files from coreProduct to BS-676