upgrade to master 5.2