CJ-1292

revisit 41ee3ec4b98f8c48516690aebcf28bfa44fba30c