Updating pi branch to Version 1.2