Merge "Messaging auto persist switch (1/4)" into lmp-dev