GSoC/Summer/3.5

#3-4, #3-5, #gsoc, #mentorship