updates from perak master