Merge master
into feature/release_6_0_0
#1320
Merged
master
into feature/release_6_0_0
#1320