6888: refactor

step up revision number to 6886
because of merging with another ( internal built)
revision