DB-775 build on 5.5