Up-port from stable branch QA-4425 Various forum issues