587: Merge ee92d68f2ba30ec2dea6efaea28c0ede444db721 into 86f2a6bd0d03d63691cc0de24917c59a9b22d49a