Merged utils and signals into models to avoid cross imports
Merge remote-tracking branch 'origin/master'