Merge MOVES improvements into bees deployment