Fixed removed comments and templates overridden in prev commit