Merge "Make sure to finish routing control action" into lmp-dev