Merged local changes of the last month in cspad, could be a risky commit