[#ENGINE-25]
merged with master
fixed wrong mask and agents loading