Merge "Make prepare properly report failure again" into lmp-dev