Merge "Cherry pick for contentAllowed bug fix" into tm-dev