[development] Prepared for update at 08/2014