Merge branch '518_instance_stats_fix' into 'develop'