[#5 #11 #12 #7 #13 #6 #14 #9 #15 #8 #17 #10 #18 #16 #19 #3 #20 #2 #21] Merge 'develop' into 'master'