(WCM-899) Updated version