Merge "Removed unused member" into devel/master