Re: #1671 front-end compliace with performance optimisation / tidy