Merge commit '9c71716e3de9b6a7e1830cae13da35ebdeeaaa80' * commit '9c71716e3de9b6a7e1830cae13da35ebdeeaaa80': Fixing bug #2023024 - there is an out of bounds exception that
Merge commit '9c71716e3de9b6a7e1830cae13da35ebdeeaaa80' * commit '9c71716e3de9b6a7e1830cae13da35ebdeeaaa80': Fixing bug #2023024 - there is an out of bounds exception that