Code cleanup
Merge remote-tracking branch 'origin/port_low_level_clean' into port_low_level