Merged the latest from dev and fixed a conflict.