Merge "Add deprecated tag and missed doxygen" into devel/master