LPS-41371 Limit it to 6.1 and above