(cherry picked from commit 32190b6cacee819036245b2a39d1068a0b0c10ac)
(cherry picked from commit 4291cc8eb1f4385528afcc9cab2592c8b3afa44a) # Conflicts: # .gitignore