Updated for L# 08.06.204 and L# Common 08.06.2014