Merge changes from K3.0.3 & branch from Matias