PR to merge bugfixes