Merge pull request #682 from ioanpocol/liveblog16

LB-1579