Merge "DevManager functionality add"