Pull in changes from silshack