Various merge from Udin
Bug Fix
FINAL