Merge branch 'amf/JQZ3T_reload_fail'