Merge "add buffering update to GenericSource" into lmp-dev