INT-2938 Polishing - PR Comments + Doc