Merge branch 'fixes_stg' of ../git_old into fixes