Merged changes from develop-result (96rslt.inc + more) into main tree. No result change