Merge Phalcom/1.3.0