Merge "This patch addresses the following issues:"