Master propegation delay fix + project cleanup
Master propegation delay fix
Merge origin/master