updated to current format DEV-10259