Merge commit 'LNX.LA.2.7-02710-8930.0' into cm-11.0-new