R9, Update 2

The issues below were resolved for R9, Update 2.