[sr-dev] git:master: cr: fix bug in recently introduced nofallback function, also remove wrong check