Merge branch 'develop' into lbudginas/#570_live_data_toggle_update