Merge branch 'tp/atomic' into ibm_next_20_tmp