merge of T&P changes
merge of t&p
fix conflict