Resolved issues discussed in code review.
Resolved merge conflicts.