Do not mask exceptions in json controllers
Do not overwrite collection archive routes with children when nesting collections
Merge branch 'refs/heads/release'