Merge "Fixed TD policies"