Merge remote branch 'tanuk2/fixes'