Merged some elements from live branch.