1.2 AprRest ready to merge to master