Merge "Add missing checks for the current session callback" into lmp-dev