Merge "Revamp pipeline view manager"