Pr 333 cherry pick

Selected cherry-picks from: #333