First commits and fixes to new extension

Change-Id: I0a2dae39b4d2c2611d4d8533ff6e3dda1361602c