merged in from upstream
merging in code from main project