APD-7-merging-develop: remove comments