Cleanup link; /i/{id} redirector
completeness
auto-merge staging into master