Merged from Develop and other small fixes