Updates;
Merge commit 'cae0e4bd3fa3f3a3fe8bffad8e1964729c44237c' into dev