Merged mga branch with trunk