Tickets/master/16287 pass lint