Merge tag 'JH7110_515_SDK_v3.6.0' into vf2-515-devel