Merge "Make unfold timeout configurable in resources" into tm-dev