Merge changes from Roland Yonaba