Merge "Exclude timed power entities due to timeout mechanism" into tm-dev