Handle more of #2205
Handle more of #2205

x1101/nikola,okin/nikola,x1101/nikola,andredias/nikola,s2hc-johan/nikola,wcmckee/nikola,x1101/nikola,gwax/nikola,gwax/nikola,s2hc-johan/nikola,s2hc-johan/nikola,getnikola/nikola,xuhdev/nikola,andredias/nikola,knowsuchagency/nikola,okin/nikola,getnikola/nikola,xuhdev/nikola,andredias/nikola,knowsuchagency/nikola,getnikola/nikola,xuhdev/nikola,knowsuchagency/nikola,okin/nikola,gwax/nikola,okin/nikola,atiro/nikola,atiro/nikola,xuhdev/nikola,wcmckee/nikola,atiro/nikola,getnikola/nikola,wcmckee/nikola