Merge branch 'MasterBugFixing' into 'master'
Merge branch 'MasterBugFixing'
[TRANSLATION] Get latest translation from Crowdin, 4 modified lines
BS-8589
BS-8589
fix builder generic type
Merge remote-tracking branch 'origin/master' into MasterBugFixing