cross-module change for 4.2