Merge resolution + Power History problems in setup.ini

All these commits are for the merge