Merge "Removed feedback controller Boost dependency" into devel/master