Merge "Ensure that custom label isn't empty" into lmp-dev