Merge branch 'alexamdre/various-fixes' into next