Updated to 201206 from devel branch