Merging up to OS_MP_140210-1532