Merge "Revert "Do not ignore forceReload requests"" into tm-dev