big aqplan commit v2 for mantis:1177