apply cluster list panel fixing commits from master