bring over from Aura.View/develop-2