Coordinated change for ASTERIXDB-2405