Fixes
Merge commit '320f01824cb1c36330297ec54fefe3586def2f3b'

# By Ernesto Iser
# Via Ernesto Iser
* commit '320f01824cb1c36330297ec54fefe3586def2f3b':
  Fixes