Merge recent changes from develop into dev_5.0