Merge pull request #655 from ioanpocol/liveblog16

LB-1517