Merge "Manage views [t*-v*] in JJB"