[CST] Update 5/12