#3714 for 3.5 AND cleaned fragments if merged code(#2816) into 2.5 that is only a 2.6 feature (That was causing problems)