Basing on 6.3.1 branch