Merge "BUG 1659 - non unified returning data default format"