Merge branch 'amf/VAIL_updates' into sprint76