Merge changes If8c8d1f3,I3a804a9f

* changes:
  [NS A27] Remove useless logs and a useless var
  [NS A26] Move available callbacks out of the rematch computation