Merge remote-tracking branch 'origin/Bitra.LA.3.2.1-target' into fp4t-target-0414