Changed: Comment.
Finish D (3rd time)
Merge branch 'develop' (with modification).