diff --git a/Changes b/Changes
index 9ff2c3ab..687c167b 100644
--- a/Changes
+++ b/Changes
@@ -1,3 +1,9 @@
+2.052000 - ?
+
+  [NEW FEATURES]
+
+  * Added SSHCollector::Platform::ASAContext (@haught)
+
 2.051005 - 2021-11-25
 
   [ENHANCEMENTS]
diff --git a/lib/App/Netdisco/SSHCollector/Platform/ASAContext.pm b/lib/App/Netdisco/SSHCollector/Platform/ASAContext.pm
new file mode 100644
index 00000000..646d5f25
--- /dev/null
+++ b/lib/App/Netdisco/SSHCollector/Platform/ASAContext.pm
@@ -0,0 +1,169 @@
+package App::Netdisco::SSHCollector::Platform::ASAContext;
+
+
+=head1 NAME
+
+App::Netdisco::SSHCollector::Platform::ASAContext
+
+=head1 DESCRIPTION
+
+Collect IPv4 ARP and IPv6 neighbor entries from Cisco ASA devices.
+
+You will need the following configuration for the user to automatically enter
+C<enable> status after login:
+
+aaa authorization exec LOCAL auto-enable
+
+To use an C<enable> password seaparate from the login password, add an
+C<enable_password> under C<device_auth> in your configuration file:
+
+device_auth:
+    - tag: sshasa
+      driver: cli
+      platform: ASAContext
+      only: '192.0.2.1'
+      username: oliver
+      password: letmein
+      enable_password: myenablepass
+
+=cut
+
+use strict;
+use warnings;
+
+use Dancer ':script';
+use Expect;
+use Moo;
+
+=head1 PUBLIC METHODS
+
+=over 4
+
+=item B<arpnip($host, $ssh)>
+
+Retrieve ARP and neighbor entries from device. C<$host> is the hostname or IP
+address of the device. C<$ssh> is a Net::OpenSSH connection to the device.
+
+Returns a list of hashrefs in the format C<{ mac =E<gt> MACADDR, ip =E<gt> IPADDR }>.
+
+This was kindly created by @haught and mentioned in https://github.com/netdisco/netdisco/issues/754 
+as being a context-aware version of ASA.pm.
+
+The code is imported from https://github.com/haught/netdisco/blob/ASAContext/lib/App/Netdisco/SSHCollector/Platform/ASAContext.pm.
+However this version did not have some ASA.pm improvements added in dc9feb747f..b58a62f300, 
+so we tried to merge all of this in here. However we lack the ability to try it, so we also 
+left in place the original ASA.pm which is confirmed to work.
+
+=back
+
+=cut
+
+sub arpnip {
+    my ($self, $hostlabel, $ssh, $args) = @_;
+
+    debug "$hostlabel $$ arpnip()";
+
+    my ($pty, $pid) = $ssh->open2pty;
+    unless ($pty) {
+        debug "unable to run remote command [$hostlabel] " . $ssh->error;
+        return ();
+    }
+    my $expect = Expect->init($pty);
+
+    my ($pos, $error, $match, $before, $after);
+    my $prompt;
+
+    if ($args->{enable_password}) {
+        $prompt = qr/>/;
+        ($pos, $error, $match, $before, $after) = $expect->expect(10, -re, $prompt);
+
+        $expect->send("enable\n");
+
+        $prompt = qr/Password:/;
+        ($pos, $error, $match, $before, $after) = $expect->expect(10, -re, $prompt);
+
+        $expect->send( $args->{enable_password} ."\n" );
+    }
+
+    $prompt = qr/#\s*$/;
+    ($pos, $error, $match, $before, $after) = $expect->expect(10, -re, $prompt);
+
+    $expect->send("terminal pager 2147483647\n");
+    ($pos, $error, $match, $before, $after) = $expect->expect(5, -re, $prompt);
+
+    $expect->send("changeto system\n");
+    ($pos, $error, $match, $before, $after) = $expect->expect(10, -re, $prompt);
+
+    $expect->send("show run | include ^context\n");
+    ($pos, $error, $match, $before, $after) = $expect->expect(60, -re, $prompt);
+    my @contexts = split(m/\n/, $before);
+
+
+    my @arpentries = ();
+    for (my $i = 1; $i < scalar @contexts; $i++) {
+        $contexts[$i] =~ s/context //;
+        debug "$hostlabel/$contexts[$i]";
+        $expect->send("changeto context $contexts[$i]\n");
+        ($pos, $error, $match, $before, $after) = $expect->expect(10, -re, $prompt);
+
+        $expect->send("show names\n");
+        ($pos, $error, $match, $before, $after) = $expect->expect(60, -re, $prompt);
+
+        my @names = split(m/\n/, $before);
+
+        $expect->send("terminal pager 2147483647\n");
+        ($pos, $error, $match, $before, $after) = $expect->expect(5, -re, $prompt);
+
+        $expect->send("show arp\n");
+        ($pos, $error, $match, $before, $after) = $expect->expect(60, -re, $prompt);
+
+        my @lines = split(m/\n/, $before);
+
+        # ifname 192.0.2.1 0011.2233.4455 123
+        my $linereg = qr/[A-z0-9\-\.]+\s([A-z0-9\-\.]+)\s
+            ([0-9a-fA-F]{4}\.[0-9a-fA-F]{4}\.[0-9a-fA-F]{4})/x;
+
+        foreach my $line(@lines) {
+            if ($line =~ $linereg) {
+                my ($ip, $mac) = ($1, $2);
+                if ($ip !~ m/^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$/) {
+                    foreach my $name (@names) {
+                        if ($name =~ qr/name\s([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3})\s([\w-]*)/x) {
+                            if ($ip eq $2) {
+                                $ip = $1;
+                            }
+                        }
+                    }
+                }
+                if ($ip =~ m/^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$/) {
+                    push @arpentries, { mac => $mac, ip => $ip };
+                }
+            }
+        }
+
+        # start ipv6
+        $expect->send("show ipv6 neighbor\n");
+        ($pos, $error, $match, $before, $after) = $expect->expect(60, -re, $prompt);
+
+        @lines = split(m/\n/, $before);
+
+        # IPv6 age MAC state ifname
+        $linereg = qr/([0-9a-fA-F\:]+)\s+[0-9]+\s
+            ([0-9a-fA-F]{4}\.[0-9a-fA-F]{4}\.[0-9a-fA-F]{4})/x;
+
+        foreach my $line (@lines) {
+            if ($line =~ $linereg) {
+                my ($ip, $mac) = ($1, $2);
+                push @arpentries, { mac => $mac, ip => $ip };
+            }
+        }
+        # end ipv6
+    }
+    $expect->send("exit\n");
+    $expect->soft_close();
+    return @arpentries;
+}
+
+1;
+
+