Merge "Resume user where they left off." into klp-dev