Develop

Other few changes provided this week after previous merge.