Merge branch 'RicardoJohann-accumulated_header_std' into develop