Merge "Rationalize API after adding maximum size feature."