ARPES-225 try harder to find the scan number, while being backward compatible
Merge branch '8.34'