Sync up with the latest version of parent framework