Merge "Change public member variable to private" into devel/master