Merged in develop changes