fix on master has been merged to branches 5.5 and 5.6