Resetted branch
pre-merge fixes