ART-686 - Tidy AP implementation, remove unused code.
Merge remote-tracking branch 'origin/kti' into kti