Merge code from appharborerror w/o configs