Merge branch 'tp/aug20' into ibm_next_20_tmp
Merge branch 'tp/aug26' into ibm_next_20_tmp