Merge branch 'tp/pseudo.readdir' into ibm_next_20_tmp