Maintenance/5.6

Merging TUJ of TDQ-9254 on master.