Changes before applying patches #17, #18, and #19