Adapt package:messages
to be loading mechanism independent
#843
+1,724
−653
package:messages
to be loading mechanism independent
#843