[KFSQA-731] Pretty confident that we have everything working now. Going to merge master in and make sure nothing broke next.