HG-16: Mercury API Extension

DO NOT MERGE, THIS PR IS PART OF PROJECT MERCURY! 
agree, will look into that