porting master to release

@Praburaj @glennc 

Porting master to release since it was behind in terms of commits. Will be adding more updates to release branch later and merging to master for beta2
It got me confused here because sometimes you talk about "us" (we) and sometimes about "me" (you)...