WAR: align to master