Added feature to build master

Change-Id: Ib02ddf2a4c5eefb851a1ce12ce515ef4b813bbc1