Added boilerplate 6.2 / 6.3 / 7.1