added in new logic
Merge branch 'THINK-281-TRN' into THINK-247
added in new logic
Merge branch 'THINK-282-TRN' into THINK-247