Applied commit which was lost during merge and added support to add std lib by default