Merge branch 'amf/linux_fix' into sprint78