[master] Further changes