Backport ProfileExtender 3.0 for 2.1.1 release