Adding inline api and markup queue support

Change-Id: I8127ea1eecf2ed118d98757625b73e943acb6777