merge from upstream theme