merge back anhaas:master of scal to cksystemsgroup:ah_master