bbbbbr Merge branch 'issue_scaler_memory_crash'