Merge branch 'aj/Feature_YC9FB_NovramLoggingOverrunChange' into sprint50