DRY
add comment
Merge commit '39af'