fixed issues with editluggage
Merge origin/InDev into InDev