Master cell autoselect added