EJ-60: added changes to support Form Canvas