* commit '007ac9cd0053e2696cd65679389600f68a090626': Add missing checks for the current session callback