[#ENGINE-25]
merged with master