merge external permalink work into dev