v0.0.05 Rebase from master extension

v0.0.05 Rebase from master extension