Merge "Merge commit '5ef374a92ab9e88659b96d917c99568a925ef432' as 'LYNQ_PUBLIC'" into MR3.0-Merge-v2.0