Note that commits for bugs #1675899 and #1679279 are not included in the branch for this bug. I kept them separate since they are higher priority.
Note that commits for bugs #1675899 and #1679279 are not included in the branch for this bug. I kept them separate since they are higher priority.