Merge "IndexOutOfBoundsException fix by adding Synchronization" into main