sample feature now in line with dev guide