merge from master and updated some constants on nodes page