Merge "Add base states with exception catching and utility functions"