#3522 added opt padding.