Merge branch 'zelgadis_master'. Resolved conflicts manually