Merge .htaccess with `client-overhaul` branch