Merge "Add explanatory comment to unexpected line of code"