AB#10824
non-committed feature. Assigning to PM doing investigation on what would need to happen here.