changes

Changes
Merge branch 'awakeel_6.3' into _MEE
style fixes