[project][*] Updating to 6.1
Merge commit '3ecd86635a0b16619707139603d83372792b01ab'