Merged commit 32fd0fafd63fd28c344859ed3eefa8d0c992ef51 from native