Capx 86

# DO NOT MERGE
Please see corresponding Jira ticket for more information.