Development branch lorex

merge