Kjq/firstpass

Consolidating branches into master.