port several changes that were only committed to fs/branch_9_3

port several changes that were only committed to fs/branch_9_3 #640