[2092] reworked a.m.e.ehc, added feature to p2 site