Fix droppable object to accept specific class
Merge branch 'MH-550' into dev