Merge "Use Handle::GetCurrentProperty instead of Devel API" into devel/master