Merge latest version from lbl to annex60 repository