ticket:1 enhancements
ticket:1 merge from t1_contact