Merge latest branch from mrn/master (commit-id: b76dd66789fc2125571ee04e5d66845d592bfb25)