Updated changes for weekly build of plasma 5