This commit was SVN r23207.
This commit was SVN r23101.
Thanks to Srini Nariangadu (Cisco) for the contribution! This commit was SVN r23076.