Merge with lyfeyaj

Update with papertrail master and resolve the 3 conflicts.