Merge "Load modules from _16K dir when running on 16K kernel" into main