Merge branch 'pu/pb/newSparkle' into stable