am 06e515dd: Merge "This patch addresses the following issues:"

* commit '06e515dd77731c1752b2ea3b1b586bcd893f0927':
  This patch addresses the following issues: