fix module issues related to gemification
Merge branch 'gemify'