Merge commit '5390130f3b288db7d67de5e6c29d0de70d327ff0' into fixes-v5.7