Merge "Null check inside filterIfNotSystemUser" into tm-dev