Merge commit '12319ff4e84ca616a671216d991dd6eaf1c39c47' into stable