Us09 jg into master

Code review passed after observations.