Merge "Fix crash and QQS session issues, visual updates"