Merge "compass: Adjust jjb and scripts"