Merge remote-tracking branch 'origin/Bitra.LA.3.2.1' into fp4t-qssi-0413