Combine patches #14 and #20 for refresh