[SYNCOPE-702] Merge from 1_2_X - This closes #10
[SYNCOPE-702] Merge from 1_2_X - This closes #10

securny/syncope,nscendoni/syncope,ilgrosso/syncope,tmess567/syncope,ilgrosso/syncope,NuwanSameera/syncope,giacomolm/syncope,apache/syncope,tmess567/syncope,ilgrosso/syncope,giacomolm/syncope,securny/syncope,nscendoni/syncope,giacomolm/syncope,apache/syncope,apache/syncope,ilgrosso/syncope,tmess567/syncope,apache/syncope,giacomolm/syncope,securny/syncope,securny/syncope,nscendoni/syncope,tmess567/syncope,NuwanSameera/syncope,nscendoni/syncope,NuwanSameera/syncope,NuwanSameera/syncope