Merge NetBSD and Courtesty tone with modifications (bug #2329)