[master] + minor updates