Merge "Add a comment" into devel/master