Make Extension optional.

Signed-off-by: crynobone <crynobone@gmail.com>
Add passthru for bound.

Signed-off-by: crynobone <crynobone@gmail.com>
Merge branch '2.1'