Merge from danielyule version
Merge aura fix
Merge another aura fix