1.2/dev-BUG42

1.2/dev-BUG42 Category Pinnacle Done