Merge remote-tracking branch 'upstream/release/3.8.0' into juanmsolaro/mobile-native-sprint/InterestingIguana.feat.enable.disable.comments