Merge branch 'fix/avr_context'