Merge in some Pirvate files changes and roadmap CSS from 3.9 that didn't make it

:-1: :-1: :100: :1234: :8ball: