Merge "Unit test for INITIAL_CONTACT" into tm-qpr-dev