behavior change: respect the administrators will to violate RFC
Merge branch 'next'