Merge branch 'stable-3.2' into pandora-3.2