Merge "Adds settings enums for Columbus settings actions"