Add cuke feature for merge; Cover non-admin scenario