support standard edition, fix bug serengeti-1218