Merge "Fix issue 3435692"