It seems like this is not an issue with version 5.x. At least I could remove the workaround we implemented - when upgrading from version 4.3.11 to 5.2.2.