Merge tag 'v3.6.1'

Tag v3.6.1

Test: Manual
Change-Id: If5fe409719b55b06be8f89aeb6fe2328a19ca68c