This commit improves the RouterFunctions.Builder based on conversations had during the weekly team meeting. Issue: SPR-16953