changes in Nov last

changes in Nov last
Merge branch 'awakeel_8.5' into _MEE
build blocks fix