Merged all changes untill commit 2427f5bf21711464771a4109368f2c72df6704eb from branch orig