master: ae60f1cb6599819bad12e1967299b3d89a2cfd41 template adjust