Added the ability to handle nested-calls to msg's buffering.
Merge remote-tracking branch 'origin/bufferisation'