Merge "add OES postfix without truncating function"