Merge "More tweaks for recording" into lmp-dev