Source code update to synchronize development branch with public branch.