Merged patch 1