#21707 Made code more generic
#21707 Fixed the error
#23846
Merge branch 'i21707' into development
Merge branch 'i23846' into development