ADWD-1031 applied changes on develop to create patch
[TASK] ADWD-1031 pulled origin feature/ADWD-1031