merge branch OW-5538-droppable-inner-ref-warning to masrter