REL-1596: Added new combinations as requested.

If somebody has a moment to quickly review the NIRI code, that would be great.